bitkeeper revision 1.1159.1.459 (41a64cc5Qhyq2RPHgOzx-x0GJlCo-Q)

sync w/ head.

diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c
index 70bcef8445d09f64b97f31af0ae3f74284b92b5a..ce001f76c896f063e443eeaaad785b2c0c8007f3 100644 (file)
--- a/xen/arch/x86/memory.c
+++ b/xen/arch/x86/memory.c
@@ -1328,7 +1328,7 @@ int do_mmu_update(
         count &= ~MMU_UPDATE_PREEMPT_FDOM_MASK;
         if ( unlikely(pdone != NULL) )
             (void)get_user(done, pdone);
-        if ( (domid != current->id) &&
+        if ( (domid != current->domain->id) &&
              !do_extended_command(0, MMUEXT_SET_FOREIGNDOM | (domid << 16)) )
         {
             rc = -EINVAL;
@@ -1336,7 +1336,7 @@ int do_mmu_update(
         }
     }
 
-    if ( unlikely(!array_access_ok(VERIFY_READ, ureqs, count, sizeof(req))) ) {
+    if ( unlikely(!array_access_ok(VERIFY_READ, ureqs, count, sizeof(req))) )
     {
         rc = -EFAULT;
         goto out;